Autogenerated HTML docs for v1.6.3-rc0-53-g1a1f0
diff --git a/git-config.html b/git-config.html index 69fbefe..5b338e4 100644 --- a/git-config.html +++ b/git-config.html
@@ -1750,6 +1750,47 @@ </p> </dd> <dt> +diff.tool +</dt> +<dd> +<p> + Controls which diff tool is used. <tt>diff.tool</tt> overrides + <tt>merge.tool</tt> when used by <a href="git-difftool.html">git-difftool(1)</a> and has + the same valid values as <tt>merge.tool</tt> minus "tortoisemerge" + and plus "kompare". +</p> +</dd> +<dt> +difftool.<tool>.path +</dt> +<dd> +<p> + Override the path for the given tool. This is useful in case + your tool is not in the PATH. +</p> +</dd> +<dt> +difftool.<tool>.cmd +</dt> +<dd> +<p> + Specify the command to invoke the specified diff tool. + The specified command is evaluated in shell with the following + variables available: <em>LOCAL</em> is set to the name of the temporary + file containing the contents of the diff pre-image and <em>REMOTE</em> + is set to the name of the temporary file containing the contents + of the diff post-image. +</p> +</dd> +<dt> +difftool.prompt +</dt> +<dd> +<p> + Prompt before each invocation of the diff tool. +</p> +</dd> +<dt> diff.wordRegex </dt> <dd> @@ -2586,7 +2627,8 @@ <p> Controls which merge resolution program is used by <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", - "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", + "diffuse", "ecmerge", "tortoisemerge", and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. </p> @@ -3219,7 +3261,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-13 02:39:28 UTC +Last updated 2009-04-18 06:17:30 UTC </div> </div> </body>
